This fixes a bunch of issues on https://wpt.fyi/ (cherry picked from commit de2b9eebe6012e321c85cdae0ca14b4be40de624)