Revert "Performance settings: Refactoring"