Revert some scary stuff
Revert some scary stuff

angr/angr,tyb0807/angr,angr/angr,schieb/angr,axt/angr,schieb/angr,iamahuman/angr,tyb0807/angr,axt/angr,chubbymaggie/angr,schieb/angr,chubbymaggie/angr,angr/simuvex,f-prettyland/angr,tyb0807/angr,axt/angr,angr/angr,iamahuman/angr,f-prettyland/angr,chubbymaggie/angr,f-prettyland/angr,iamahuman/angr