Revert "JWR changes"

This reverts commit a19586d967beb95742e7f32c26105974ed643ca9.
Revert "JWR bits and pieces"

This reverts commit 8810633b80a595d941702489109bf546c44c37fc.