Revert "Use template always."

This reverts commit b7af6006a2a5a33235806ad5a3ce584dd1e30f33.