Remove old attempts to manage memory issues by catching re-trying. It never especially helped and new fixes actually resolve the underlying issue