The fix/workaround from #18851 should, hopefully, make this redundant. This reverts commit 48a3cf58d5.
48a3cf58d5