Manually revert c68e64e474c7230de90edbbbe73714b30603fb11

It turns out this was right the first time.

Ticket: #5230