Revert "Attempt to fix scope issues"

This reverts commit 959c3d522346930e5444f0067f6a0212b99ff291.