Merge "Revert^2 "ART: Remove workaround in verifer after Jack update.""