revert overeager gofmt