Revert "optimizations" 2/3