Reverted last 2 commits

[Masakazu Kitajo]

Sorry for the recent borken commit.
I couldn't fix the build , so I reverted the commits for now.

I'll keep try to figure out the build issue.

Msakazu