I would be skeptical at best that they would actually do away with the permit system, as much I would like them to. I have heard rumblings for the past 5 years that they would get rid of it but nothing has happened. Even if it does happen it is likely to take a while before everyone fully understands that. I still have police trying to find my visa in my passport, convinced that my residence permit is not a valid visa, this is a few years after the change.
Also the permit often times is never seen by the tourist at check-in at the airports. It is usually needed to purchase the ticket but is usually not actually ever seen by the tourist. It is really just a "tax" that people will pay. I agree that now with the train it will be harder to enforce.