Revert code to support one call to ES only