I am looking for a way to make Group Policy changes that will allow me to undo simply and quickly. For instance let us say I have a policy - either a default or one I've created - and I want to modify it. I am looking for a way to 'add' a policy that will override the one I'm changing and all its settings but if it doesn't work I can simply remove the policy. I would mark all such policies with some kind of pre-fix so I instantly know they are modification policies. What is the best way to do this?