Backed out changeset fef7cf65b4e7 (bug 832960) for making bug 857240 perma-fail.