This reverts commit e515d7f773 and also commit 1c9f08e986 (cherry picked from commit 9fa155b)
e515d7f773
1c9f08e986
(cherry picked from commit 2e4c0b4)