I wasn't planning on doing it for the first service.
When I had my Golf R, I used to reflash it to the stock mapping before taking it for a service, then would flash back the aftermarket ROM after, then I got lazy and didn't bother changing it at all. Made no difference to the couple of warranty claims I made.