Drop awkwardly-bolted-on '--debug' flag

Change-Id: I96e5c0fb3c701f49706dfffe23b03a15b3cd9a73