Revert "perf: reduce memory usage + increase speed ~10%"

Revert "perf: reduce memory usage + increase speed ~10%" #1026