It seems that this patch got applied on master long ago, see commit
ce5af131d896f45c088a30d13f62a0914d97829b.