Revert "gcc master revisions"

This reverts commit 20815cd17e14364ec92798505051f56b54caa46d.