diff --git a/private/app_neverallows.te b/private/app_neverallows.te
index 1e82404..344ecd5 100644
--- a/private/app_neverallows.te
+++ b/private/app_neverallows.te
@@ -274,6 +274,3 @@
 # This will go away in a future Android release
 neverallow { all_untrusted_apps -untrusted_app_25 } proc_tty_drivers:file r_file_perms;
 neverallow all_untrusted_apps proc_tty_drivers:file ~r_file_perms;
-
-# Untrusted apps are not allowed to use cgroups.
-neverallow all_untrusted_apps cgroup:file *;
diff --git a/private/priv_app.te b/private/priv_app.te
index 192221d..e12cce7 100644
--- a/private/priv_app.te
+++ b/private/priv_app.te
@@ -218,6 +218,3 @@
 # upon traceur to pass a file descriptor which they can then read
 neverallow priv_app trace_data_file:dir *;
 neverallow priv_app trace_data_file:file { no_w_file_perms open };
-
-# Do not allow priv_app access to cgroups.
-neverallow priv_app cgroup:file *;
diff --git a/private/system_app.te b/private/system_app.te
index 4bfcc18..40fec6a 100644
--- a/private/system_app.te
+++ b/private/system_app.te
@@ -122,9 +122,6 @@
   proc_version
 }:file r_file_perms;
 
-# Settings app writes to /dev/stune/foreground/tasks.
-allow system_app cgroup:file w_file_perms;
-
 control_logd(system_app)
 read_runtime_log_tags(system_app)
 get_prop(system_app, device_logging_prop)
diff --git a/public/app.te b/public/app.te
index 800e891..5a82152 100644
--- a/public/app.te
+++ b/public/app.te
@@ -22,6 +22,10 @@
 # Notify zygote of death;
 allow appdomain zygote:process sigchld;
 
+# Place process into foreground / background
+allow appdomain cgroup:dir { search write };
+allow appdomain cgroup:file rw_file_perms;
+
 # Read /data/dalvik-cache.
 allow appdomain dalvikcache_data_file:dir { search getattr };
 allow appdomain dalvikcache_data_file:file r_file_perms;
diff --git a/public/domain.te b/public/domain.te
index 2eb2e15..16cc098 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -258,17 +258,9 @@
 allow domain sysfs:dir search;
 allow domain selinuxfs:filesystem getattr;
 
-# Path resolution access in cgroups.
-allow domain cgroup:dir search;
-allow { coredomain -appdomain } cgroup:dir w_dir_perms;
-allow { coredomain -appdomain } cgroup:file w_file_perms;
-# TODO(b/110043362): Clean up cgroup access from non-system domains.
-allow { domain -coredomain } cgroup:file w_file_perms;
-auditallow {
-  domain
-  -coredomain
-  -vendor_init
-} cgroup:file w_file_perms;
+# For /acct/uid/*/tasks.
+allow domain cgroup:dir { search write };
+allow domain cgroup:file w_file_perms;
 
 # Almost all processes log tracing information to
 # /sys/kernel/debug/tracing/trace_marker
diff --git a/public/init.te b/public/init.te
index 31fa797..18d11b6 100644
--- a/public/init.te
+++ b/public/init.te
@@ -93,7 +93,7 @@
 allow init tmpfs:dir create_dir_perms;
 allow init tmpfs:dir mounton;
 allow init cgroup:dir create_dir_perms;
-allow init cgroup:file rw_file_perms;
+r_dir_file(init, cgroup)
 allow init cpuctl_device:dir { create mounton };
 
 # /config
diff --git a/public/vendor_init.te b/public/vendor_init.te
index b6502d2..dfd4d8f 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -15,7 +15,6 @@
 
 # Create cgroups mount points in tmpfs and mount cgroups on them.
 allow vendor_init cgroup:dir create_dir_perms;
-allow vendor_init cgroup:file w_file_perms;
 
 # /config
 allow vendor_init configfs:dir mounton;