And remove --test-no-auto-scan, as the 'no auto scan' feature isn't only a test feature now.
(aleksander) I messed up the integration of commit bc49794848, this should fix it.
bc49794848