Revert "More optimizations"

This reverts commit abca9262368a3ab844f146b57095ceccbdb8cde9.