Effectively revert commit d1b256a1 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858