An improved gravel-packing tool assembly with a baffled stinger pipe for gravel-packing a perforate liner having substantially the same internal diameter as the casing string extending from the perforate liner to the earth surface. A perforate nipple and a swab cup are provided between the check valve and the baffled stinger pipe of the tool assembly to allow drainage of the annulus above the tool assembly through the stinger pipe to thereby avoid swabbing the well as the tool is retrieved from the well.