Backed out changeset bb5701078d13 (bug 961238) for likely troboprovider bustage.
Merge m-c to fx-team on a CLOSED TREE.