undo protocol-buffers related changes that shouldn't have landed on master
Merge branch 'master' into dev

Conflicts:
	sentry_test.go
	statsd.go
	statsd_test.go