Reverting back to 0.90.7 config/templates loading behaviour

Closes #4511