While adding check that the temp file move succeeds, overlooked that the
file handle is actually leaked, which means the move will fail on WNT
because the file is already open.

(regression from ef490df2)

Change-Id: I779ccde79871930fef3bad7e17b633fb62e36a46