Revert "Fix CM derp"

This reverts commit 4bbc772c5f466811a4e9f7de66b3343b2e2d5ea4.
Revert "policy: Offload enhancements"

This reverts commit ccfa7465a5e511571491e77b94919b4b862682d2.