Revert "Revert "That was a bad idea""

This reverts commit 08a8a5289c01d9feb44e37b1c375ce403643c010.