Revert "Merge branch 'shouldImport-fix' into develop"

This reverts commit 1b257ae5f85f01f8aba8c728559dc25067328933, reversing
changes made to cfb210c6cf6c04f6230736ee6d8076e4758d34fc.