Partially undo last fix