Switch off of Elasticsearch as main storage.

newline.  also - this is to run tests against both versions of ES correct?