This change broke compilation on go 1.3 and running e2e tests on OS X. This reverts commit 86b023fdd6.
86b023fdd6