Another attempt at fixing PR2975.