Revert previous commit

Caused a few issues.