Revert "Broke everything"

This reverts commit c404407b58488a43d39e46b41c79320450affc68.