This optimization was added recently but is still buggy,
so back it out for now.
Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>