Handle old template format