Revert "Revert "Merge branch 'patch-24' into '24.0'""

Who said having two development branches wasn't a bundle of fun?!

This reverts a revert of something that should not have been reverted. I think roughly what happened here was:

• We pushed something that should have targeted 24.0 into main (!72180 (merged))
• I pushed that into 24.0 (!72509 (merged))
• The daily sweep somehow caused a conflict (?)
• ✨ magic ✨
• We ended up with the change in only 24.0 and not main

This reverts commit 6d0c9e07.