Merge branch 'sctp-bad-revert'