Revert "overdue performance restored (INCOMPLETE FIX)"