revert last two bad commits, I'm dumb and they were bad