Workaround to native elasticsearch client issue post v1.0.3