Revert "template conditionals"

This reverts commit 30f1e0d9ca305ffbaed1faac07d1549aa3d3be32.