Not in RBHs planning. His season objective was the Dauphiné where they tried him as a Captain for the first time. Then he was expected to use his remaining form to help Roglic in the tour. They never had him on the cards for a podium. That happened because Roglic couldn't follow on some of the Pyrenaes stages.He was expected to be before Onley though.
And he was one of the main contenders for the podium even before the Tour.