This reverts commit 7406e06aae34300cc2a17f990af5f33abc579afc. Ouch. The revert of revert was not what I meant. :|