Revert "wjp-update"

This reverts commit e1de05a82ea2ff5d50ed0986fc7b8ca6302cb743.
Revert "Revert "wjp-update""

This reverts commit c451fef37112ce2aed0f6dd07dfd370fc12a7ef5.