use upstream sawyer now that fix is merged