Revert "Break stuff again"

This reverts commit 7cb6a1bed1dc4912e12642e48f7afe73266a968b.