Back to cpu policy sharing
Revert "Back to cpu policy sharing"

This reverts commit 3f8cfca39aba671ce84a5615499651500887f2e1.