Remove temp files that leak into container directory - again

Resolves: https://www.pivotaltracker.com/story/show/62031750