For ENG-4716, fix performance regression caused by repeated config mungi...

...ng