reverting performance enhancements