Reverted inadverently committed items related to [add-support-for-templates-and-config-files]

This should fix it. Sorry for any trouble caused!