rollback to template version

removed Lucy's commit