Fix a merge that reintroduced removed code.
I actually ran into this problem too when I tried to test all the MRs together (in my case I accidentally deleted too much instead of leaving too much in), so I checked the commit history when I saw it'd been merged.
This block was removed in: a692008e
It was reintroduced as a result of a merge conflict in: 633be0b2 54847f04