There is an issue in the current version of the grammar that causes duplicate scopes. Until that's fixed, rolling back