Recommits most of f1ee1689c695db13ef4cfc159e9a7d6fd4a23ccd but without the SDKROOT and MACOSX_DEPLOYMENT_TARGET changes. We will want to make those changes eventually though and must do so before full testing begins for next release.