8dd9c11241
This reverts commit ae8995fec2.
(cherry picked from commit cd35171fd18d47839faa3ea119f3cbfc356c0a65)