Fix accidental reversion in 1247d7c14582