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