I have a Solution with a canvas app and multiple flows. The solution initially has the Power Apps setting "add env vars when new data sources added" turned ON. Then I determined I will reuse one the SP lists rather than manage a DEV version and a PROD version so if there is a change, I wouldn't have to change it in two places.
So I updated the Power Apps setting "add env vars when new data sources added" to be turned OFF and I removed (not deleted) the env vars from the Solution. I tried to import it into my PROD env and I got the message shown below like it was expected env vars. Then I changed "add env vars when new data sources added" back to ON removed and added back data sources, exported Solution and tried again and I got the same dead end screen also shown below.

At this point, I'm not sure how to proceed to fix this import issue. Any recommendations are appreciated.