Back out 91b95649a71e for GCC bustage. r=red on a CLOSED TREE.