Re-add config that is actually required on the build machines.