Back out 9e126e97e347 (bug 1098700), a=backout
Merge m-c to b-i