diff --git a/.gitignore b/.gitignore
index f89b918cc..21dc8e534 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@
 **/arclib
 
 ##### Client Private Plugins (symlinked)
-**/app/src/error-logger-extensions
 **/internal_packages/composer-mail-merge
 **/internal_packages/composer-scheduler
 
diff --git a/app/build/Gruntfile.js b/app/build/Gruntfile.js
index 10f71e071..1d3f9a50b 100644
--- a/app/build/Gruntfile.js
+++ b/app/build/Gruntfile.js
@@ -35,12 +35,9 @@ module.exports = grunt => {
       'src/**/*.es6',
       'src/**/*.es',
       'src/**/*.jsx',
-      'src/K2/**/*.js', // K2 doesn't use ES6 extension, lint it anyway!
-      '!src/K2/packages/local-private/src/error-logger-extensions/*.js',
       '!src/**/node_modules/**/*.es6',
       '!src/**/node_modules/**/*.es',
       '!src/**/node_modules/**/*.jsx',
-      '!src/K2/**/node_modules/**/*.js',
       '!internal_packages/**/node_modules/**/*.es6',
       '!internal_packages/**/node_modules/**/*.es',
       '!internal_packages/**/node_modules/**/*.jsx',
diff --git a/app/build/tasks/docs-build-task.js b/app/build/tasks/docs-build-task.js
index 2547325ca..e728d51de 100644
--- a/app/build/tasks/docs-build-task.js
+++ b/app/build/tasks/docs-build-task.js
@@ -59,7 +59,7 @@ module.exports = function(grunt) {
 
       let srcPath = path.resolve(__dirname, '..', '..', 'src');
 
-      const blacklist = ['/K2/', 'legacy-edgehill-api', 'edgehill-api'];
+      const blacklist = ['legacy-edgehill-api', 'edgehill-api'];
 
       let in_blacklist = function(file) {
         for (var i = 0; i < blacklist.length; i++) {
diff --git a/app/src/error-logger-extensions/raven-error-reporter.js b/app/src/error-logger-extensions/raven-error-reporter.js
index a7bce1b24..365d7bd6a 100644
--- a/app/src/error-logger-extensions/raven-error-reporter.js
+++ b/app/src/error-logger-extensions/raven-error-reporter.js
@@ -56,6 +56,15 @@ module.exports = class RavenErrorReporter {
       }
     ).install();
 
+    // Just give us something random that we can use to tell how many users are impacted
+    // by each bug. This is important because sometimes one user will hit an exception 1,000
+    // times and skew the Sentry data.
+    Raven.mergeContext({
+      user: {
+        id: this.deviceHash,
+      },
+    });
+
     Raven.on('error', e => {
       console.log(`Raven: ${e.statusCode} - ${e.reason}`);
     });