This reverts commit 64b1be29.

Reverting in preparation for another implementation which is
bionic-compatible.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>