Backed out 2 changesets (bug 890072) because gcc sucks

Backed out changeset ff011e5b3655 (bug 890072)
Backed out changeset 0ed650741dc5 (bug 890072)