Fix regression introduced with patch for c++/775