Undid scope simplification because it was much slower.