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