reverts to using mainline m-c