Fix compile error from bad merge in #8556