Merge pull request #159 from greboid/newserverdialog

Stop using StreamUtils methods.
Stop using StreamUtils methods.