Changing from subversion/honoring to choice/nochoice