Revert "merged with rtbkit/master"

This reverts commit 6df8b882095be95eb71915e4f1f477e08a276c92.