This commit reverts 273eeb813c (#26825). For the discussion so far, please refer to #28527. Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
273eeb813c