Will the non-touchbar MBPs continue to ship with the prior version of the keyboard?

I can see why Apple wouldn't go around trumpeting that the old models are getting upgraded, since it could dampen sales for the high-end models. At the same time, it would be pretty lousy to ship new units with keyboards that they've basically admitted are borderline defective (by offering a 4-year replacement program).