Revert "Merge pull request #1597 from talko/backportlivesubscriber"

This reverts commit 6c43f66c9ae748b0ef42606cb1f86439c0ed4836, reversing
changes made to a21a33f1bd753252fbac809ba37a77428bd67a96.