Revert "Workaround for case 539074"

This reverts commit c293b1a314772eb232ec529497c1e632741d669f.
More localized workaround for case 539074.
Doesn't break stack traces in general,
and fixes the reported behavior.
We may be missing some other corner cases,
but we'll have to handle those as we come to them.