fix bad merge from 85992cb #717