Revert "Experiment with moving scope into stereotypes"