Revert "json conversion fixes"

This reverts commit 74d6460aa857e0f3eed2956965a5d7021de4f973.