Merge "Remove common_time code"