*** Submitted as http://code.google.com/p/go/source/detail?r=51cd50c53e00 *** rollback of http://codereview.appspot.com/181077 (broke build) TBR=dho http://codereview.appspot.com/181139