Despite asking twice and showing return boarding card, I was sent through immigration and right back through exit immigration today.
It was a bit of a faff, luckily no queues at either passport control. Arrived back at gate as Group 1 boarding was happening.
Felt tight, but doable. Perhaps tightened by catching up time from a go-around on inbound flight.