No functional changes, just to make the next patch easier to review (cherry picked from commit 8a0fd83c)