Reverted change to Scope to test compiler fix