Bug 870676 followup, fix bustage in the wake of bug 875934
CLOSED TREE
Merge m-c to a CLOSED TREE m-i