Merge "Remove gcc 4.9 workaround."