Fix a merge conflict: all the cool kids just delete any code that doesn't automerge, without considering how easy it'd be to do manually.
