This reverts commit 41af38f3, reversing changes made to f0fec244. Let's delay this. We have some serious regressions.