Revert last commits and restore previous working fix [1]. Switch to OptionsNG. PR: ports/176795 [1] Submitted by: Eric Krausser <eric@krausser-edv.de>