Revert "And now it is completely broken. :P"

This reverts commit 133dd704ad4f1029e16f3d7a3872198bc0ffb3dc.