Fixed broken integration tests caused by PR #2418
Reverted a new flag (for hydrate protocol) to prevent breaking integration
tests due to pull request #2418. The option needs to be revisited later for the
hydrate protocol, but for now it will at least stop breaking things by default.