Backout of changeset e46098561cb1 because bug 943804 fixed bug 892638. a=test-only