Seems a bit invasive for a bugfix release.

This reverts commit f9d14b54.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>