Backout changeset f4beba4909b0 and changeset 1666ca9b946b for bc test failures.
Merge backout on a CLOSED TREE.