This _large_ diff just has indentation differences as this is now inside a function called when the config promise is resolved.