Bug 908844 (eee919f11f5a) bustage followup: XML is hard

--HG--
extra : rebase_source : 85a61533e6192fd84f89cfabb5af7c1ab8f1171a