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