Backed out changeset 62cce2cf895f (bug 1016611) for causing Android bustage on a CLOSED TREE