Revert "reporter callback fix"

This reverts commit a19d7245adfd91fadf6a40b09510e4cc056da2ea.
Revert "ridiculous hack to let delivery timing client stay connected"

This reverts commit cb8e2b640e95ae8f662a1c6615db1ed2c0762eb7.