Backed out changeset e9a7aaad1771 (bug 958420) for causing merge conflicts from m-c