Revert DR connect protocol (cherry pick to dr-integration)