Replace the offending argument earlier in the boot process.

Signed-off-by: Mohamed Karami <karamimed@gmail.com>
v2.3: some config changes