as discussed with @hjelmn in open-mpi/ompi-release#86 This reverts commit d2d7f39a4bc8dde7e8c480f248819ec0d0e6be62.