Cleaning up a very bad merge.