612910
Revert "Merge branch 'cboltz-elasticsearch-workaround' into 'production'" This reverts merge request !115