Revert r335094 and properly fix OFED build after r335053.
MFC after: 1 week Sponsored by: Mellanox Technologies