Backport the JSON parsing fix to the 1.6 series