Move the autoinstaller disabling code to a more useful location