The performance update
Revert "The performance update"

This reverts commit 9996b8034c97eaa9a3800dd3b4d88a4cc539ffd2.
Revert "Revert "The performance update""

This reverts commit 506886f2ab7359d5b174bf52ea33b87e158976fc.
The fix for the screwups