Issue #2327775 by DanChadwick: Fixed new default conditional contains remnants of last define conditional's rules.