Revert "Substitute templates"

This reverts commit 06f48a7ef76413d9cbde53be8dcff5c8b6aa497f.