Merge "Remove temporary bail-out on something that crashed jack often."