Revert "Revert "Changed global to subscriber_only""

This reverts commit 211124efd35eeade3f514d090bebada222504538.