Revert "Back out Elasticsearch for beta GeoData for now"

This reverts commit 29a5337148fd97ba253e9858a9c7934e5be33bc6.

Change-Id: I06ee85854dcd07342392789ba33da8648cdec8b4