Reverted all to do with REST es client