Revert "Merge pull request #75 from ratanasv/tinker-with-es"

This reverts commit 80236a1e33893382dc829e0dccd8e654e80ae39e, reversing
changes made to 40e2695cf83836748c97afa7b0a60868fc85e8e8.