Revert "Issue #2172561 by Gábor Hojtsy: Config overrides may spill over to undesired places."

This reverts commit f2769f4db32f69a68ad4391d60d3847b9da538e6.