undo dodgy optimization