Reshuffle around to load less config in non-interactive mode