Backed out changeset 7d7ccb243db5 (bug 1062578) for breaking webplatform 4 tests