Revert "nanny: cleanup of apply policy functions"

This reverts commit 007c079604dad20bd90985f0d749c555e30c2eee.

This one isto get testing branch in line with master. The above reverted commit is the current difference, and the commit is wrong.