Revert "attempt #3: trying to undo the things i just broke"

This reverts commit 75e9bae081baebacd858a5f98b86384882b134aa.