Reverted everything back to before FUBAR status