Revert attempted fix for ERRAI-689 (@Scope annotation required after all)