Revert #152369 because of multiple regressions
The regressions are documented in the PR comments. This reverts commit 2972b5e, reversing changes made to f908263.
J
Jonathan Brouwer committed
65745a1b95ece068a127b2cd009d2c0bd4a9f65d
Parent: 30107e8