Fix #8141 Don't refer to 'custom-setup' as 'optional'