OSXfix
Revert "OSXfix"

This reverts commit 178a7ed1840f4c57166e069e862b30e99f75974e.
OSXfix