Added backward compatibility when dynamic policies are disabled