diff --git a/private/untrusted_app_25.te b/private/untrusted_app_25.te
index e576d27dc9f01efe5047c08dd4cad47adaaf762f..bb95b1fb84ccb75d345294ce33c9987b530a1dd6 100644
--- a/private/untrusted_app_25.te
+++ b/private/untrusted_app_25.te
@@ -42,3 +42,6 @@ allow untrusted_app_25 proc_misc:file r_file_perms;
 # https://github.com/strazzere/anti-emulator/blob/master/AntiEmulator/src/diff/strazzere/anti/emulator/FindEmulator.java
 # This will go away in a future Android release
 allow untrusted_app_25 proc_tty_drivers:file r_file_perms;
+
+# Legacy text relocations
+allow untrusted_app_25 { apk_data_file app_data_file asec_public_file }:file execmod;
diff --git a/private/untrusted_app_all.te b/private/untrusted_app_all.te
index 6534412719923951ff924997828aec8f5fb8a8d5..7d4737dee7f97cd63ac5d0626be55be5e979b951 100644
--- a/private/untrusted_app_all.te
+++ b/private/untrusted_app_all.te
@@ -17,18 +17,15 @@
 ### seapp_contexts.
 ###
 
-# Legacy text relocations
-allow untrusted_app_all apk_data_file:file execmod;
-
 # Some apps ship with shared libraries and binaries that they write out
 # to their sandbox directory and then execute.
-allow untrusted_app_all app_data_file:file { rx_file_perms execmod };
+allow untrusted_app_all app_data_file:file rx_file_perms;
 
 # ASEC
 allow untrusted_app_all asec_apk_file:file r_file_perms;
 allow untrusted_app_all asec_apk_file:dir r_dir_perms;
 # Execute libs in asec containers.
-allow untrusted_app_all asec_public_file:file { execute execmod };
+allow untrusted_app_all asec_public_file:file execute;
 
 # Used by Finsky / Android "Verify Apps" functionality when
 # running "adb install foo.apk".
diff --git a/public/domain.te b/public/domain.te
index b8004ac945c1d8b3516bc4faf9656b76ae1aaa80..9ee41ab50ee2cb95395864dacd76e332926e56ae 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -499,7 +499,7 @@ neverallow * self:process { execstack execheap };
 
 # prohibit non-zygote spawned processes from using shared libraries
 # with text relocations. b/20013628 .
-neverallow { domain -untrusted_app_all } file_type:file execmod;
+neverallow { domain -untrusted_app_25 } file_type:file execmod;
 
 neverallow { domain -init } proc:{ file dir } mounton;