Fix bad merge from fix for issue 13867.