Fix X-includes
Hack: allow json parsing to fail, fall back to old parsing
while we have a partial implementation