Revert "So that was a bad idea..."

This reverts commit 856cdbf417e2adcb32f0998460597d7756d6502c.