Revert master changes

changes are moved to combinedCourse branch

This reverts commit 1c57d3e12392fd0f4e22803a24f36629694525ad.