Revert "Revert "Merge pull request #175 from uber/fix_time_heap_drain""
Revert "Revert "Merge pull request #175 from uber/fix_time_heap_drain""

This reverts commit c7264f647cbbbe8ba138c1e3f5f43808cc7f4fd1.

uber/tchannel-node,uber/tchannel-node