Revert temp workaround for user policy. Needs FIX