This reverts commit 052d62ee75.
052d62ee75
(cherry picked from commit e1f515377d) (cherry picked from commit 728efdd8a8)
e1f515377d
728efdd8a8