OSHMEM: revert r31412, it did not pass jenkins