init commit of support for jsonDataSource. Untested.
Revert "init commit of support for jsonDataSource. Untested."

This reverts commit 55b6fd90f150fa6cb6ffed93ff0ea3500cf384c1.