Revert "Hiroshi"

This reverts commit 24824814d5d1f32c57e333218095a36493d7a1da.