Backout unsuccessful merge from m-c to oak.