The other code does more or less the same, but it seems that
a lot needs to be cleaned up still...

PR: https://forum.opnsense.org/index.php?topic=3311.0