Revise for go 1.4.