Backed out changeset 5a6b95c47b55 (bug 1068671)
Backed out changeset b30d47d94a85 (bug 1068671) for bc1 test failures