Reverted JSON to 1.7.x