Revert "Merge branch 'origin/Semester'"

This reverts commit 72f4eb6c8fde6573843702c96a2d9740b2f467b4, reversing
changes made to 18e83ac55205005ab5007d300749f0768e4a1be1.