Reverted variable subsitutions but kept them in config setting