Bug 1051777 - Backout skip changeset cc32cbd05b32 due to fix in mc