Merge pull request rust-lang#3931 from tgross35/backport-remove-tmp-file

[0.2] Remove temporary file that was added by accident

Author: tgross35