Revert "Finally flattened the JSON key-value pairs"

This reverts commit 11cc867d7ed630f6a182db45dce8341a6190309b.