Revert "Argh, I give up. This just won't work."

This reverts commit 63b2eaeb47404b898f872ab175b004610f90f250.