diff --git a/rootdir/init.rc b/rootdir/init.rc
index 42f049a9f..a2d9f1840 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -439,7 +439,8 @@ service drm /system/bin/drmserver
 service media /system/bin/mediaserver
     class main
     user media
-    group audio camera inet net_bt net_bt_admin
+    # STOPSHIP: remove system from mediaserver groups
+    group audio camera inet net_bt net_bt_admin system
     ioprio rt 4
 
 service bootanim /system/bin/bootanimation