This reverts commit e80661dff2. It was originally reverted as it broke the abi but can now be safely brought back. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I8cd3d50680e6493d7aa4e714e3b6f343bda2dc9d
e80661dff2