Revert "performance improvements"

This reverts commit f0cfbec0d244e165bb49b9682a2b39699d76936f.
reverted