Revert mac rdisk vs disk stuff as I'm not convinced it makes much difference.