Revert "New broadcast receiver implementation"

This reverts commit 34192effff4f4d5eb289f1c53cf1dd6681db9588.