Backed out changeset 93cbcd7f34b3 (bug 828508) on suspicion of making bug 807442 nearly perma-fail on debug builds on a CLOSED TREE.