Actually do what was already commented in 90aa46893...