Fix accidental swap from fixing merge conflicts.