Backed out changeset 428bea088d2b (bug 927254) for build bustage