Revert r315672 from SDP. This change is not yet available in 11-stable.
Sponsored by: Mellanox Technologies