In the second part, looks odd that those two lines are a perfect copy of what is
already done near the start of the function, but I have no insight at all into
that code, so just leave it at that.

Change-Id: I6b1d973f77a3d9389880ddec500968144ba615f2