Backed out changeset f3643ddd721f (bug 1050376)
Backed out changeset 48816257a7b0 (bug 1050376) for bc2 test failures