Revert "optimizations"