Backout 472087bf4626 (Bug 984361) for link errors on a CLOSED TREE.

--HG--
extra : rebase_source : fdd7dba227e4c7481b3394aed30052c7909acda4