Revert "Same freeze issue, now checking if it's in estate"

This reverts commit ca380ec0397b28a3d7a3f2c60aeb6eaf1153be31.
WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.