This reverts commit 17df897c32. That did not work *at all*... We really need some tests for all of this.
17df897c32