Backed out changeset 2fe4ca46eec8 (bug 947736) because of build bustage

Landed on a CLOSED TREE