Removed template changes from previous commits.
Removed template changes from previous commits.