Revert "Condensed output JSON value names"

This reverts commit e628ad9ecd102557d987ffd12d942331c58c0be1.