Revert "Expand variables in configuration files" - I feel I've been here before.
Breaks some test runs.

This reverts commit a9eef029b61825f39d1a5301bb7923f9d1c0a8ce.