Alikins/990195 revert remove subscribe