This reverts commit bcb4d17236.
bcb4d17236
(cherry picked from commit 61e8750169dd1f797f4cd607d72f4b6cd3d0705f)