Merging somehow went the wrong way, attempting to undo that here.