See if this change helps fixing the random failures in gt build