Reverting 039027c8f3a6fea40d0ac777357aea272fe5f164, previous commit broke policy updates