CORE-4838: refactored the time parsing code a little