Revert "1.7.10 fixes backporting"

Reverts SkyNetAB/enhanced-portals#132

Ugh wrong branch.