Backed out changeset e268bb51e084 (backout of bug 1033958) because it can't be responsible for "breaking many people's builds". a=backout