Revert previous simplification which broke some exercises
Revert previous simplification which broke some exercises

RJFreund/OpenDSA,RJFreund/OpenDSA,vkaravir/JSAV,RJFreund/OpenDSA,vkaravir/JSAV,RJFreund/OpenDSA,RJFreund/OpenDSA,RJFreund/OpenDSA,RJFreund/OpenDSA,RJFreund/OpenDSA