Revert "Switch to Christopher83's GCC"

This reverts commit ada9a7cf5ac3507fecf32baa668fceb66a7ef68e.