Revert 'No longer force OSX configuration' : Use condition instead