Revert everything back to before the merge of doom