cf08d2746d
This reverts commit 4f5fc3be2c.
It breaks the abi in a way that is not needed for the Android trees.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0b07da8f83077b68da09526d25b0e19b6ed28eed