Back out 567d2bba4f97 (bug 933483) for causing bug 946726
Merge m-c to b-i