This reverts commit 5d0d5494db58422eb528c0f8b39a86ea966505e9. The previous revert was done because it mistakenly identified 15577 as the source of a csit crash in link bonding test.
The csit crash was actually due to the test image missing the patch https://gerrit.fd.io/r/#/c/17731/
It was a mistake to revert the original patch https://gerrit.fd.io/r/#/c/15577/