Revert previous simplification which broke some exercises