Revert "Performance update"

This reverts commit fede9640323bfef0ed3e02178c0ba38816fe2afd.