Replace the offending argument earlier in the boot process.
Revert code that will now never be called.