Remove what looked like some bad merging.

This makes us closer to what's in m-c

--HG--
extra : rebase_source : 8f628f84e82d507396d02b9168aa4aa84d206f0b