Reverted OSX-specific changes.