Backed out changeset c381e6fba574 (bug 1046142) for bc1 failures