diff --git a/app.te b/app.te
index 53349140ed7399acf4338eb9b2a8e9f99a915062..3e58736b9d10d4d2c0f3b2746460bc2d69b199b0 100644
--- a/app.te
+++ b/app.te
@@ -11,9 +11,6 @@
 allow appdomain self:process execmem;
 allow appdomain ashmem_device:chr_file execute;
 
-# Allow apps to connect to the keystore
-unix_socket_connect(appdomain, keystore, keystore)
-
 # Receive and use open file descriptors inherited from zygote.
 allow appdomain zygote:fd use;
 
diff --git a/file.te b/file.te
index dc0b0c68b26d1527c52d3824df3c6e45471f3336..8ff08276ea37597201a91e8fbfaefc73dcbfb695 100644
--- a/file.te
+++ b/file.te
@@ -109,7 +109,6 @@ type dnsproxyd_socket, file_type, mlstrustedobject;
 type dumpstate_socket, file_type;
 type gps_socket, file_type;
 type installd_socket, file_type;
-type keystore_socket, file_type;
 type lmkd_socket, file_type;
 type logd_debug, file_type;
 type logd_socket, file_type;
diff --git a/file_contexts b/file_contexts
index 4b0ae8ab15aa359ebdae12dacaa915fdc248ed84..4f843d3c3d9e302bb8cc7ffab382971bb54329c6 100644
--- a/file_contexts
+++ b/file_contexts
@@ -79,7 +79,6 @@
 /dev/socket/dumpstate	u:object_r:dumpstate_socket:s0
 /dev/socket/gps		u:object_r:gps_socket:s0
 /dev/socket/installd	u:object_r:installd_socket:s0
-/dev/socket/keystore	u:object_r:keystore_socket:s0
 /dev/socket/lmkd        u:object_r:lmkd_socket:s0
 /dev/logd_debug		u:object_r:logd_debug:s0
 /dev/socket/logd	u:object_r:logd_socket:s0
diff --git a/system_app.te b/system_app.te
index 702c5563540422645da6416b169ed09e47977fc2..a20a4ece1d3a8bd8e2ae454b7400d38e85c0b272 100644
--- a/system_app.te
+++ b/system_app.te
@@ -23,9 +23,6 @@ allow system_app wallpaper_file:file r_file_perms;
 # Write to dalvikcache.
 allow system_app dalvikcache_data_file:file { write setattr };
 
-# Talk to keystore.
-unix_socket_connect(system_app, keystore, keystore)
-
 # Read SELinux enforcing status.
 selinux_getenforce(system_app)
 
diff --git a/system_server.te b/system_server.te
index 2d5c331e6ea2af09ed22708077a38a987ebcdadd..01ddeb71035763e7ee30355b322631df41c692b3 100644
--- a/system_server.te
+++ b/system_server.te
@@ -87,7 +87,6 @@ unix_socket_connect(system_server, lmkd, lmkd)
 unix_socket_connect(system_server, netd, netd)
 unix_socket_connect(system_server, vold, vold)
 unix_socket_connect(system_server, zygote, zygote)
-unix_socket_connect(system_server, keystore, keystore)
 unix_socket_connect(system_server, gps, gpsd)
 unix_socket_connect(system_server, racoon, racoon)
 unix_socket_send(system_server, wpa, wpa)