Merge "Revert "Fiddle with 602-deoptimizable for adding debug info when it fails.""