CLC-3347 - Revert CLC-3178 changes pending fix for Canvas import inconsistency

https://jira.ets.berkeley.edu/jira/browse/CLC-3347

If this is OK, it also needs to get into QA ASAP.