Revert "Revert "Well, that was a bad idea""

This reverts commit 193d1b52b67019a3bcf075952a95ecd417510f2f.