Backed out changeset 4330724d9e05 (bug 940811) for breaking builds