Revert "remove ES"

This reverts commit 48a265d7d88077154ed2424ab04249412b218871.