Back out changeset 9af1a51e337e now that we have the machines upgraded and capable of using gcc 4.7. r=backout