This reverts commit 099816587a. It had some unforseen side-effects that should be investigated first.
099816587a