Rebased3 fix replay

I don't really think this is a practical concern to be honest and we'd be better off using the local time to create less confusion.