Revert "Lets try Speed up things"

This reverts commit 4b0e80426b341a1d493531a08aa20433508b1d19.