This change partially reverts #112357 to avoid test failures on machines which do not have gcc installed.