My understanding, from my accountant (who checked with a nationally-known tax lawyer) once a PFIC, always a PFIC. That means we have to continue filing form 8621 and declare a QEF every year.
Regardless of what happens, this will always be taxed as short term capital gains in the United States, regardless of how long you’ve held. Hence my dream that we get bought out in a share-for-share transaction.
This is how I have been playing it for the last several years. As Geo said, check with your own financial folks and don’t take my word for it…