Revert "eclass:  workaround OpenMPI build issue #462602"

This reverts commit 5e9b1be531ca02607e730a5b43765850eae9a0c5.