Template loss during 1.3->1.73 upgrade