Undo the TEST_SOLVER changes