Add json checks back as Spark bug has been fixed