TRQ-2775. Make the -C option work without -t as well as with -t