Bugfix: Use existing global config object instead of creating a new one.
Depends on D552
Please do not commit a bogus patch and then fix it. Just do the right thing, especially if it is one liner.
Didn't realize this was amending another diff that hadn't landed yet.
You want me to un-land the bogus patch and fix it?
Bundled into D552