Undo fixes

Because they didn't fix squat