This reverts commit f57a49c2f9. This had some unexpected side effects, needs some more work.
f57a49c2f9