Revert moving gcc to g++11 in 18c3b1