revert change intended for OS X branch