Revert "This implementation needs to be better"
Revert "This implementation needs to be better"

This reverts commit 9dc17e9aad74f45bdcad12f8813341eb69a6d45d.

rabblerouser/core,rabblerouser/core,rabblerouser/core