Can anyone confirm whether the wine and champagne selection in AS has reverted to F class options rather than J class options?

I'm convinced that the seriously downgraded AS wine and champagne offer reported in January was the result of a cock-up, rather than a conspiracy. Likewise I think, albeit in the other direction, serving the ultra-premium Alexandra rose champagne in business class on all flights for a period.

I'm flying back from Bangkok in a few days, but with a 1 hour 10 minutes connection at Doha, won't have time for a lounge trip. Or possibly with just a 1 hour 10 minutes connection at Doha, I'll end up with lots of time on my hands...