Revert "Fix count for ES v1.0+"

This reverts commit 3687eb30393a7f6117a4f776b6e3f37d3f529521.

Let's punt on this until we can make a whole branch for 1.0.