undo a bunch of span fix attempts