Backed out changeset 85a89a0a4c1c (bug 1110069)
Backed out changeset bc169301ff47 (bug 1015163) for bc1/bc2 test failures