Revert OSX CPKG_OS override