Revert "JWR changes"

This reverts commit a19586d967beb95742e7f32c26105974ed643ca9.