Backed out changeset 91f25a63dea9 (bug 1032814) for build failures