Thomas is Bjorn again after three-year drought