EZP-22564: try waiting for ES