Incrementally putting stuff back in place for re-written runs.