This reverts commit 17b8858408, reversing changes made to 0375d6469a.
17b8858408
0375d6469a
Former-commit-id: ea473061ef1f3b52716decfb4dafcfd66167730d