With the decoupling of the Client this is now possible, so this should be changed.