• Revert some optimizations.