Backed out changeset 781fc1eb104a (bug 801598) for bc1 test bustage