There is no external knob to disable config includes, so remove the internal boolean option.
I'm not sure this change is right, see my comment in D41358.