Revert "Merge branch 'json_live' into Development"

This reverts commit b69bd3c3ccb15d4168e8e21f56000dc15d80c54f, reversing
changes made to 513f53464f1cc470f568f294d0534faefd6d085a.
Revert b69bd3c..d1a7807

This rolls back to commit b69bd3c3ccb15d4168e8e21f56000dc15d80c54f.