Revert "optimizing performance"

This reverts commit 897f10d5ad1dfb1789f1a8bac0fa32718e15f3a7.
time is 1.360 seconds with 17% occupancy