Revert "Performance improved"

This reverts commit 86462d32dc50329c9800606dce8e97a2df1021b1.
Performance imprevoed