Revert "Merge pull request #3 from k-okada/hydro-devel"

This reverts commit 5a78ba22cc4cd7214bd0f0098f7ae828ef8b5ea0, reversing
changes made to 44839ed9e1c6191600479b1d2c9101152c084418.