Revert "Simpify JSON once more"

This reverts commit 483b7d9fb049395ba378779986e1b248f98092ff.