Revert "Merge branch 'MergingJSONClass'"

This reverts commit 10fda91c489bdb356cb526804cb2965e8ec2e7df, reversing
changes made to fdc6b47b1948da00b4e531bff3eaaeb5e498d082.