Revert "Merge pull request #4912 from zehome/openbsd_pkg_flavourfix"

This reverts commit de2f4cf04d13b24dc56114da1ab63245c5868c34, reversing
changes made to 2c33737bfa3b2e7286ada2f2f7bba57317f2b885.