Remaining commented out code wasn't picked up by clangd during renaming. (cherry picked from commit fe4987e0)