[Commits] 870143250c5: Post-rebase fix