Closing as WONTFIX to release pressure on QE, given that the original reporter states that they don't need any further backport. Please reopen should the need for this backport reappear.