Fermilab linac injector, revisited