Revert "Broke stuff"

This reverts commit 52925badfb98088429789282511596a7a5068e13.