Issue #1998576 by beejeebus, alexpott, swentel: Make the config import process use full config trees again.