diff --git a/client/selfrepair/self_repair_runner.js b/client/selfrepair/self_repair_runner.js
index <HASH>..<HASH> 100644
--- a/client/selfrepair/self_repair_runner.js
+++ b/client/selfrepair/self_repair_runner.js
@@ -1,5 +1,3 @@
-import uuid from 'node-uuid';
-
 import JexlEnvironment from './JexlEnvironment.js';
 
 const registeredActions = {};
@@ -58,21 +56,6 @@ export function fetchAction(recipe) {
 }
 fetchAction._cache = {};
 
-
-/**
- * Get a user id. If one doesn't exist yet, make one up and store it in local storage.
- * @return {String} A stored or generated UUID
- */
-export function getUserId() {
-  let userId = localStorage.getItem('userId');
-  if (userId === null) {
-    userId = uuid.v4();
-    localStorage.setItem('userId', userId);
-  }
-  return userId;
-}
-
-
 /**
  * Fetch all enabled recipes from the server.
  * @promise Resolves with a list of all enabled recipes.
@@ -134,7 +117,7 @@ export async function filterContext(driver) {
   return {
     normandy: {
       locale: driver.locale,
-      userId: getUserId(),
+      userId: driver.userId,
       ...client,
       ...classification,
     },
Removed uuid stuff from self repair runner