Backed out changeset d42938fd0288 (bug 1002855) for web-platform-4 test failures