Backed out changeset e2a22ba1d1e4 (bug 1015433) for build bustages