Backed out changeset 962d9383207f (bug 940153) because of build bustage

Landed on a CLOSED TREE