Fixes #2324 (cherry picked from commit 172180cb21) Co-authored-by: Josh Mock <joshua.mock@elastic.co>
172180cb21