Revert "* reduce scope"

This reverts commit e9dd3456b4e551e513b5b3bebc27ba2e32c39cb1.