Revert "Using underscore templates now"

This reverts commit 7b7e67c183427fe8a527502788c98e6a2040297d.