The disclosure presents a heat exchanger assembly having a first manifold, a second manifold spaced from the first manifold, a plurality of refrigerant tubes extending between and in hydraulic communication with the first and second manifolds, a plurality of corrugated fins inserted between the plurality of refrigerant tubes, and a condensate extractor having a comb baffle portion with fingers inserted between the plurality of refrigerant tubes and a conveyance portion. The comb baffle portion is configured to extract condensate from between the plurality of refrigerant tubes and the conveyance portion is configured to convey condensate away from the heat exchanger assembly.