Fix tick crash following branch merger.