This reverts commit f1b095c784de6d1908fa40dcf76e733110cbeaf2. Signed-off-by: Tomislav Janjusic <tomislavj@mellanox.com>