Moving to the for here before the fix gets upstreamed. We might revisit
this at a later point anyway.

Release Notes:

- N/A