Revert to f3de994ea06364e4ba438c78cccc9e5e320487d7 - for Go 1.2 compat.