Merge "Fix broken time comparison."