Revert "Broke stuff"

This reverts commit f7d45826db32f9f6a5251f58dc1f800cf16129f5.