Undo most of the cleanups of the last commits to be able to MFC this change to stable/8.
Undo most of the cleanups of the last commits to be able to
MFC this change to stable/8.

ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl,ossy-szeged/sctp-refimpl