Bug 902281, backout complete-updates for m-c and ux

--HG--
extra : rebase_source : 11d4586950d9e2e8b213c2018a00a089308c3ea9