Revert "Refactored filesystem operation dispatch to get rid of the extra function for OS X"

This reverts commit 8d1e7c38631a88166fec9d844640997554359698.