[cvs-nhc98] patch applied (hat): Refactor, replacing Unset command with Set, but pushing the boolean into the