ba4f0c63e4
(cherry picked from commit 916bc99f2c)
See the grandparent commit.
(cherry picked from commit 916bc99f2c)
See the grandparent commit.