BugLink: https://bugs.launchpad.net/bugs/1836666

This reverts commit e9a60ab1609a7d975922adad1bf9c46ac6954584 which is
commit fc340115 upstream.

Hauke writes that this breaks the build and should be reverted.
Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Christian Lamparter <chunkeey@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>