Revert "removed needless option"

This reverts commit d78953ee6c447f1e582233a4d6d248b33a289984.
Merge branch 'fix-travis'
Merge branch 'master' into plugin_storage_spike