!!! DO NOT merge - debug OSX failure