RDMA fix, revert workaround