(fixes #2420) reverted unnecessary commits.
(fixes #2420) reverted unnecessary commits.

* revert commit:0df5d28e53ba5d4983f6b0a7dec1b9d69e4ce7cf
* revert commit:41fbb5536f1609a2d0e640bf29351846a7ce8b5d

tejima/testravis,tejima/testravis,tejima/testravis