Merging things back the way they were.