Revert some optimizations.