Apparently the use of port 6030 was causing some confusion. Fixes bug 1095474. Change-Id: I0cc71f4733ad91694e015a9b75c3eda080aca6fb