Cleanup remaining use of removed variable to fix the build