Merge "Fix overly agressive cleanup."
Xavier Ducrohet [Thu, 20 Sep 2012 01:46:05 +0000 (18:46 -0700)]

Trivial merge