Yamamoto had missed nearly three months because of shoulder trouble