Uncommented perf2 conversion.
Merge branch 'v6-lsp'
Revert "Merge branch 'v6-lsp'"

This reverts commit 807de22e15731a6b353bdab7fb65ca2f2177e440, reversing
changes made to 12ebb0b0bd753d9db9843b1835bd9a40949da533.