Revert "cherry pick d285baf035ad7b8d5d90790dc01761af95bd332e"

This reverts commit ad78eb7d4765e584e1ce4cd03f8067402f13d506.
2 files changed