This reverts commit 23a0d847.

Patch has issues that's being addressed by the Florian and he will
follow up with a new patch to address the original issue.
Signed-off-by: NOlof Johansson <olof@lixom.net>