Revert "Robustness fix"
Revert "Robustness fix"

This reverts commit 62679a6ab77cfac7df2310f91908faf90903b9ff.

iamahuman/angr,schieb/angr,angr/angr,angr/angr,iamahuman/angr,schieb/angr,angr/angr,schieb/angr,iamahuman/angr