Revert "Remove -P/--pid switch from CLI"