Revert "Use a per-thread array"