Revert "Upgrading escope version and fixing related bugs"

This reverts commit 2acdacce2c0a0d52464e12c65957c4948033d867.