This change was overlooked, thanks to a combination of Jira checklist items + inexperienced team members + quite late landing of the HWE stack. LP: #2098105