This reverts commit ce663baa10. Revert due to issue in MLNX SAI: https://github.com/Azure/sonic-swss/issues/199
ce663baa10