Fix a bad merge from merge 7580b5d.