Two recent MRs (!71478 (merged), !71281 (merged)) broke LLP1. This MR resolves the issues to get LLP1 working again.