Actually was simpler than I thought, move two lines, change one line. Upon closer look, the restartFirewall function has a parameter to disable the host check.
I just posted a patch to the ticket @lgaetz linked above.
Still, not a fan of the whole restart approach. What I came up with for non-distro installs works better.