RevMan,
There is a redraft in play, which would solve many of the problems. However it's been put on the back burner due to disagreement over the status of a bit of rock on the bottom of one member state.
So, expect nothing to happen until that little political disagreement is resolved. And don't blame the EU, the EC, the parliament or Brussels for this one.