This reverts commit bfdad565.

The patch turned out to be incorrect, and will be replaced
with a correct patch.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>