This reverts commit 6c182dd1. No reason to drop working code, for which there is no other alternative (in this case, formatting/checking HFS+ filesystems).