Back out recent changes to this patch which seem to have broken building on i386 and caused amd64 snaps to not work with pf enabled.
Back out recent changes to this patch which seem to have broken building on i386 and caused amd64 snaps to not work with pf enabled.