Revert "Start cleanup of codegen templates addresses #6"

This reverts commit 4345f1cf95a3b6f364b3540638d4f288c9d4a33d.