Reapply 'fix config file madness'

Change-Id: I997a9849777372a5eb355d25c26a931c741e53ab