Backed out changeset 28664fb86b3c (bug 1036847) for causing frequent OSX mochitest timeouts.