Revert "more changes, I think I'm going to revert"

This reverts commit acec50b639a701e1f71d960d2ad1b5527aa9bfb3.