Undo merge error that brought back code I deleted.