Backed out changeset a2f2a28e0856 (bug 1024513) for build failures