This reverts commit 5d0f6f5251 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: Ie0781c078f72ae185f25dea17b684f091da2db60