Revert "cleans up JSON building, causes communication errors"

This reverts commit 493ae4abfb7847485da6f4424978965ace533e0b.