diff --git a/cadvisor.go b/cadvisor.go
index 58d0d95a..31b18f71 100644
--- a/cadvisor.go
+++ b/cadvisor.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/cadvisor/api"
 	"github.com/google/cadvisor/container/docker"
-	"github.com/google/cadvisor/container/lmctfy"
+	"github.com/google/cadvisor/container/raw"
 	"github.com/google/cadvisor/info"
 	"github.com/google/cadvisor/manager"
 	"github.com/google/cadvisor/pages"
@@ -51,13 +51,11 @@ func main() {
 		log.Printf("Docker registration failed: %v.", err)
 	}
 
-	// Register lmctfy.
-	if err := lmctfy.Register(); err != nil {
-		log.Fatalf("lmctfy registration failed: %v.", err)
+	// Register the raw driver.
+	if err := raw.Register(); err != nil {
+		log.Fatalf("raw registration failed: %v.", err)
 	}
 
-	// TODO(vmarmol): Have a no-op or "raw" factory.
-
 	// Handler for static content.
 	http.HandleFunc(static.StaticResource, func(w http.ResponseWriter, r *http.Request) {
 		err := static.HandleRequest(w, r.URL)
diff --git a/container/docker/factory.go b/container/docker/factory.go
index e3c033df..1aff45db 100644
--- a/container/docker/factory.go
+++ b/container/docker/factory.go
@@ -61,7 +61,7 @@ func (self *dockerFactory) CanHandle(name string) bool {
 	if self.useSystemd {
 		return strings.HasPrefix(name, "/docker-")
 	}
-	return name == "/docker" || strings.HasPrefix(name, "/docker/")
+	return strings.HasPrefix(name, "/docker/")
 }
 
 func parseDockerVersion(full_version_string string) ([]int, error) {