Back out changeset 4304cf04f1e8 (bug 868498 patch 2) for causing bug 894931.  a=me