Undid erroneous optimization in SubScriptActor in previous commit