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