Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot