Revert double commit
Already implemented differently in updates from CAF, this isn't needed. derp.

This reverts commit dab9ea8e495d76290c0f191c592761fc88e907dc.
cgroup: revert some upstream changes
to fix build
Signed-off-by: Luis Cruz <ljc2491@gmail.com>