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