Revert "22920136"

This reverts commit 52a26f012d1de2c9e1c0de25e90d1cba6f1e45a5.
22920137