Backed out changeset 012e11e54840 (Bug 1101921) for build bustage on a CLOSED TREE

--HG--
extra : rebase_source : 38aac2c757b138fbdf754abb374f326048a5516a