ENG-6344: Use offset from message for tracking.