Backout things philor tells me to (Bug 853360, Bug 849918).
Merge on a CLOSED TREE.