SpaceX does have one without the aerosurfaces and heat tiles, but that isn't the one lined up for the first launch. Ship 24 should be able to attempt the reentry flop-and-flip maneuvers, assuming the test gets that far. Last I heard, Elon was only giving the first test a 50% chance of getting to orbit.