diff --git a/manager/orchestrator/replicated/update_test.go b/manager/orchestrator/replicated/update_test.go
index b5aa6798d4..b672d65b36 100644
--- a/manager/orchestrator/replicated/update_test.go
+++ b/manager/orchestrator/replicated/update_test.go
@@ -1,7 +1,6 @@
 package replicated
 
 import (
-	"fmt"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -21,6 +20,7 @@ func TestUpdaterRollbackAndPause(t *testing.T) {
 }
 
 func TestUpdaterRollbackAndPauseNoMonitor(t *testing.T) {
+	t.Skip("skipping - see #2137")
 	testUpdaterRollback(t, api.UpdateConfig_PAUSE, false)
 }
 
@@ -185,32 +185,7 @@ func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_Fa
 	assert.Equal(t, observedTask.Status.State, api.TaskStateNew)
 	assert.Equal(t, observedTask.Spec.GetContainer().Image, "image2")
 
-	// FIXME(aaronl): Once intermittent failure is resolved, replace the
-	// following loop with:
-	//observedTask = testutils.WatchTaskCreate(t, watchCreate)
-loop:
-	for {
-		select {
-		case event := <-watchCreate:
-			if task, ok := event.(api.EventCreateTask); ok {
-				observedTask = task.Task
-				break loop
-			}
-			if _, ok := event.(api.EventUpdateTask); ok {
-				assert.FailNow(t, "got EventUpdateTask when expecting EventCreateTask", fmt.Sprint(event))
-			}
-		case <-time.After(time.Second):
-			s.View(func(tx store.ReadTx) {
-				service := store.GetService(tx, "id1")
-				fmt.Printf("service: %+v\n", service)
-				tasks, _ := store.FindTasks(tx, store.All)
-				for i, task := range tasks {
-					fmt.Printf("task %d: %+v\n", i, task)
-				}
-			})
-			assert.FailNow(t, "no task creation")
-		}
-	}
+	observedTask = testutils.WatchTaskCreate(t, watchCreate)
 	assert.Equal(t, observedTask.Status.State, api.TaskStateNew)
 	assert.Equal(t, observedTask.Spec.GetContainer().Image, "image2")