diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index a62d5d5..6347f9f 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -127,17 +127,6 @@
         if re.search("android_device_.*_%s$" % device, localpath.get("name")):
             return localpath.get("path")
 
-    # Devices originally from AOSP are in the main manifest...
-    try:
-        mm = ElementTree.parse(".repo/manifest.xml")
-        mm = mm.getroot()
-    except:
-        mm = ElementTree.Element("manifest")
-
-    for localpath in mm.findall("project"):
-        if re.search("android_device_.*_%s$" % device, localpath.get("name")):
-            return localpath.get("path")
-
     return None
 
 def is_in_manifest(projectpath):