Revert "messed some stuff up"

This reverts commit 7694bf444819989758b33962cb57e785601bd2f4.