Revert "Add scopes."

This reverts commit 6f3f17bac889bbba04b6d16e53cddc3a6b338120.