Revert "bad code that breaks stuff"

This reverts commit 03326e0a4d08b15a4c77cb81ca30dc5630fc2bd9.