Fix unmerged change from sometime before