Reverted the --debug switch, ref #1