Lost this in cd109127cad; #2399