Revert "Subscriptions fixed"

This reverts commit e3562389b6933b02a094d2a8fed6ba753e2db743.