Revert "Revert "Crap""

This reverts commit a593c0abfa030299ece56313b6fd0941e55cec9f.