Upstream bug is fixed.

http://golang.org/issue/6319

Change-Id: I9467a7727fdb4b27cb1c4b5ceb093c2b1635427f