Merge "Revert "temporarily remove abort() to facilitate debugging""