Revert "Merge branch 'master' of https://github.com/hrtusd/CactusEMU"

This reverts commit 565b619207a176f65c3c087075096d6de5dc387d, reversing
changes made to 1da5ec3e3ddb7e968c3048941988ac98e54e0bc2.