Revert "Trying to fix slow after long time running."

This reverts commit 64dd94314c19197dc9a7e5598ed96636120ef0c2.