simpler faye restart

Change-Id: I704fb0b43c66474372ce6bd1872fa22f0c24fbcf