Restore backwards-compatible behavior of scopes