Backed out changeset e03a9a31e9c4 (bug 857617) because of build bustage

Landed on a CLOSED TREE