Revert "Revert "H.Tsuchiya""

This reverts commit db3575a65aa641c8d7de257d00ae361c2c15dbf3.