Bug 869038 - Clear expando object the right way. r=bz.

--HG--
extra : rebase_source : c75c0ac7b07bbe9396f1b77b34c1e34575078a49