Remove the incompatibility (regression) between the -I and -Q options.

Remove the incompatibility (regression) between the -I and -Q options. #2497