diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 70da806d5e..1a45ec4f79 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -28,7 +28,8 @@ import bb
 from bb import cooker
 from bb import ui
 from bb import server
-
+from bb.server import none
+#from bb.server import xmlrpc
 
 __version__ = "1.9.0"
 
diff --git a/bitbake/lib/bb/server/__init__.py b/bitbake/lib/bb/server/__init__.py
index 1a732236e2..e69de29bb2 100644
--- a/bitbake/lib/bb/server/__init__.py
+++ b/bitbake/lib/bb/server/__init__.py
@@ -1,2 +0,0 @@
-import xmlrpc
-import none