Merge "Remove obsolete GCC workaround."