Remove template variable assignments that weren't removed in the merge from the 2.6.0 branch to 2.7.0.
Remove template variable assignments that weren't removed in the merge from the 2.6.0 branch to 2.7.0.