Revert "re-implement "JWR changes"""

This reverts commit 312ba0e22688f0ffa1239bef26a0a360417c7ecd.