Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"

This reverts commit 838fdb76529eec6359605411b3b578f06ba28f87.
6 files changed