Build #4030048:   add back import changes for name shadowing on branch refactor-courses-to-course about 3 hours ago