Revert "Break tests. Muahahahah."

This reverts commit 939005a743ac9332bf710f968609e14ee2d022e8.