This reverts commit 2799b28e61. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2799b28e61