Fix a merge problem between 6.1.x and master.