Bug #2590

Spurious spaces have been deleted.
Revert "Bug #2590"

This reverts commit ca0e05cedd9f516ff24e99511f6c08a835691da7.
Bug #2590 Long server names...

Spurious spaces have been deleted.