Remaining commented out code wasn't picked up by clangd during renaming.
mentioned in commit 9a0be9f7