Revert "Working a bit more on JK2 interface in JA"

This reverts commit 6f9fd68e1c8b2fba6bd15b37720534f712171e91.