backout 66e30c4870bb for breaking OSX (#13150)
5 files changed