Revert "missing template fixes"

This reverts commit 9fca2d0685a0027596994d66b0a2475b793174fe.