The workaround from #1847570 helps here, so I'll mark this a duplicate and reopen if it happens to be different after all.
The workaround from #1847570 helps here, so I'll mark this a duplicate and reopen if it happens to be different after all.