Also fix pre-existing build breakage (@ahesford). Co-authored-by: Roberto Ricci <ricci@disroot.org> Co-authored-by: Andrew J. Hesford <ajh@sideband.org> Closes: #27899 [via git-merge-pr]