diff --git a/containerd/main.go b/containerd/main.go
index e713b3fc0..8e30114d2 100644
--- a/containerd/main.go
+++ b/containerd/main.go
@@ -62,7 +62,6 @@ func main() {
 			context.String("listen"),
 			context.String("state-dir"),
 			10,
-			context.Bool("oom-notify"), // TODO Windows: Remove oom-notify
 			context.String("runtime"),
 		); err != nil {
 			logrus.Fatal(err)
@@ -73,11 +72,11 @@ func main() {
 	}
 }
 
-func daemon(address, stateDir string, concurrency int, oom bool, runtimeName string) error {
+func daemon(address, stateDir string, concurrency int, runtimeName string) error {
 	// setup a standard reaper so that we don't leave any zombies if we are still alive
 	// this is just good practice because we are spawning new processes
 	go reapProcesses()
-	sv, err := supervisor.New(stateDir, oom, runtimeName)
+	sv, err := supervisor.New(stateDir, runtimeName)
 	if err != nil {
 		return err
 	}
diff --git a/containerd/main_linux.go b/containerd/main_linux.go
index 3d143960e..2abf327ed 100644
--- a/containerd/main_linux.go
+++ b/containerd/main_linux.go
@@ -25,10 +25,6 @@ const (
 )
 
 func appendPlatformFlags() {
-	daemonFlags = append(daemonFlags, cli.BoolFlag{
-		Name:  "oom-notify",
-		Usage: "enable oom notifications for containers",
-	})
 	daemonFlags = append(daemonFlags, cli.StringFlag{
 		Name:  "graphite-address",
 		Usage: "Address of graphite server",
diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go
index b0ec84402..f282e4d0d 100644
--- a/supervisor/supervisor.go
+++ b/supervisor/supervisor.go
@@ -18,7 +18,7 @@ const (
 )
 
 // New returns an initialized Process supervisor.
-func New(stateDir string, oom bool, runtimeName string) (*Supervisor, error) {
+func New(stateDir string, runtimeName string) (*Supervisor, error) {
 	startTasks := make(chan *startTask, 10)
 	if err := os.MkdirAll(stateDir, 0755); err != nil {
 		return nil, err