Moves the fixes to subscription back into the plulgin files