Merge "Revert "ART: Enable more passes under try/catch""