Revert scope fixes

This reverts commit 08b65b0fb1cd880190e77b123db0fd0213973ec6.