This reverts commit 20d6f231f8 which
showed up in 5.10.36 and broke the abi. It should not be needed in
Android systems at this time so it is safe to revert.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If85580eb86669f957de49faee773a2ed7690bcd2