Revert "Merge pull request #77 from jugglinmike/950973-isolate-scopes"

This reverts commit e2e594aa7ef5a95e1c5ff1f762ad253650d276eb, reversing
changes made to 47728b0d5beddcf229c3b658892a3a30cd88bd1e.