Revert "partially replace client, target, origin with HookContext"

This reverts commit a948c8af8f450ecec043bbe6d44c9ab519d14fe5.