A patch that fixes this landed on core-updates, see #38873. A follow-up
bug regarding some cleanup is #39415.