I'm committing this fixup without review because it's an obvious continuation of D65121 (committed at f471eb8e99b5).