Merge "Go back to original string for <1 day case"