This reverts commit 117433236a which is
commit f7cfd871ae0c5008d94b6f66834e7845caa93c15 upstream.
It breaks the API and we don't need it right now in the 5.4 tree.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia4d89b6dfbb92d6bd48b36b1f85559a8dfb331c6