Reconstruct 9 and 13 support for HISQ longlinks