Revert "Fix PR c++/44188"