Revert "This thing still doesn't work"

This reverts commit 2534e8b5047b713cd18aebcea47e30d9661db0e3.