procedure for Kiddush on second night of Succos

Is the minhog to reverse the Layshaiv and Shehecheyanu on the second night of Succos? It would seem from the Shulchan Aruch that this would be proper, as the Rosh says that it is preferable.

Daniel

I'll, admit, I'm confused here. R’ Hamburger uses the Rosh as a paradigm for Ashkenaz Jewry. He is the one with the famous saying that our minhogim are from Bayis Sheni. So how is it that something the Rosh says is the proper minhog, has become a Polish custom and not a German one? When do we follow the Rosh and say that he is the prototype for Ashkenazim and when do we say he is not?

Daniel