Revert many futures to more operations than connections

Upstream connection closing issue has been fixed
Pass the correction options to heartbeatStreamFactory