Hello rsc, I'd like you to review this change.
*** Submitted as e97519bcae0c *** import: clean up correctly R=rsc http://codereview.appspot.com/2875041