Revert "Well, that was a bad idea"

This reverts commit a65eb3f9eac7f81bb93cfa98094859bf102b34a4.