This reverts commits d8d8f4f670 and 9614f6d0d9. (cherry picked from commit 91914f1a71)
d8d8f4f670
9614f6d0d9
91914f1a71