Revert "1.7.10 fixes backporting"
Merge pull request #133 from SkyNetAB/revert-132-1.7.2-updating

Revert "1.7.10 fixes backporting"