Revert "MacOSX.diff"

This reverts commit 78dd48b08e3703214ec7a9ef808089379c1b6024.