Critter-3, I suggest that you remove the word 'Yes' from your answer. The question that skk4 asked was how this is to be handled, which the rest of your reply does address, indicating that this would be a regular distribution of contribution basis that is required to be reported on Form 8606 and is not a return of contribution.
skk4, be aware that you are reading the instructions for 2019 Form 8606. The deadline for obtaining a return of a 2019 contribution was October 15, 2020 and has already passed. A return of contribution would have been required to be accompanied by any investment gains attributable to the contribution being returned, and those gains would be subject to income tax and early distribution penalty.
