This was already partially done in 695ee6fd, but we missed this line. (cherry picked from commit 8c8823f7)