Revert "Add optional signal forwarder and '-z' option to cli" am: 7151582f0b am: 4aa196e11a
am: 9e1a385208

Change-Id: I8c6266e3c2b1eb26a2411eb7e348eaf79831dd83