Revert PR #4038 for causing WPT failures.