This i still an issue since we had to revert the change added by this branch (it was breaking the GTK client).
This i still an issue since we had to revert the change added by this branch (it was breaking the GTK client).