Backed out changeset c5ac0914b65c (bug 1033958) for breaking many people's builds, rs+a=backout