Revert topic.
Merge topic 'diagnose-invalid-_IMPORT_PREFIX-generation' into next

a3c35b58 Revert topic.