This reverts commit 8ddc58e0e3 which is
commit 44b3834b2eed595af07021b1c64e6f9bc396398b upstream.
It breaks the kernel api and needs to come back in an abi-safe way in
the future.
Bug: 161946584
Bug: 248633761
Cc: Will Deacon <willdeacon@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8f01b84f204fe99d262b2c5a463ddb27d54ceb46