Re #7481. Addition required to use the new option.