Get your taxes done using TurboTax

I have the exact same situation as described in this thread.  I am curious why we are guided to select Code P and not Code 8.  In Turbo Tax Premier 2019, Code P says "Return of contribution taxable in 2018".  Code 8 says "Return of Contribution Taxable in 2019".  Isn't this a return of a deferral that is taxable in 2019?