Backed out changeset c5ac0914b65c (bug 1033958) for breaking many people's builds, rs+a=backout
Backed out changeset e268bb51e084 (backout of bug 1033958) because it can't be responsible for "breaking many people's builds". a=backout
merge m-c to inbound; a=merge
merge m-c to inbound