Revert "merging upstream statsd changes"

This reverts commit cc15435deda6c8b7958ea004207dc97bc2f213da.