Backed out changeset 06a8a827447d (bug 826805)
Backed out changeset 936504af8ef1 (bug 826805) for m1 test failures