I feel like they aren’t going to have Gold turn back scale-y because they’ll be worried it would confuse the audience. They didn’t have MM and Emma find different clothes in FTL because they were afraid people wouldn’t be sure if they were in a flashback or not. Especially if we get Rumple and Peter Pan backstory, I think they’ll want to keep them separate.