Optionalise the use of Time.current, rather than always using it

I originally made this change a year ago when we were preparing for timezone
changes, and it made sense at the time.  However, now we're expanding into
international territories, it would be better to use UTC as standard instead.
Original use case still stands though.