7458eff2d8
This reverts commit c12bdbae8e7bc14da8966e45a3c450913e32129f. (cherry picked from commit 1c3e96bf7f463949997c03e2119cfa55fd63dcd0)