Back out changeset e8bf739addfa (bug 868498 patch 2) for causing bug 894931.