This reverts commit 81a3bb64.

This commit broke all builders running with pid_max > 32768.

Reverting for now so we can bring the build farm back online.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>