Revert "manual cherry-pick 4685133cb91ebae32696905ee4c48a5e29e80f30"

This reverts commit 136a46f999e0e205c45492fb984c1d202a8b6ac2.
2 files changed