Backed out changeset 07708c9fc5ef (bug 883010) because of test failures

Landed on a CLOSED TREE