This reverts commit 57224ff4. This commit may trigger crashes on some workloads. Revert it for clearness.