Revert "Changes for JSA"

This reverts commit 310651e2aeed840b5f614907d7abd0966d6f964a.
Moving to 1.x branch