Backout part of 2f79b0b939ed that's unrelated. a=bustage-fix on a CLOSED TREE

--HG--
extra : amend_source : 5a094388b0dce4b8030f0d385905bf73d9b82064