p-s: fix mismerge and drop superfluous comment

Signed-off-by: Andreas Beckmann <anbe@debian.org>