See #33026 for more context.
Comment From: sdeleuze
Closing in favor of #33026 that I should be able to fix in 6.2.