I loving the game and tend to praise them.
But i agree that this is a really bad move.
The solution you proposed is the obvious one, hopefully it will eventually come to fruition.