CLC-3347 - Revert CLC-3178 changes pending fix for Canvas import inconsistency
Merge pull request #2171 from raydavis/raywip

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