Backed out changeset 71abd0791f96 (bug 1016387)
Backed out changeset 039f1a265da2 (bug 1016387)
Backed out changeset 7fd7d28cd78f (bug 1016387)
Backed out changeset 746989e4c8d1 (bug 1016387) for bc1/bc3 test failures