This reverts commit 0ecf3c951c0a87ab5bdd76a541a69852af671ba9. Signed-off-by: Xin Zhao <xinz@mellanox.com>