Forgot to undo
Removed deprecated OnSubscribeFunc