Revert "fix with-statement conversion"
Revert "fix with-statement conversion"

This reverts commit 72b38b64685bee57da18cac879c208e9ad375217.

Submitty/AnalysisTools,Submitty/AnalysisTools,Submitty/AnalysisTools,Submitty/AnalysisTools,Submitty/AnalysisTools,Submitty/AnalysisTools