Merge "Remove crash workarounds, add logging"