This reverts commit 1f16d824a8.
This commit was not submitted upstream and is now causing large merge
conflicts. If it is still needed, it needs to be sent upstream for
review and acceptance there.
Bug: 168544734
Cc: Badhri Jagan Sridharan <badhri@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icbbc5f13adb1c10d864f8be641b6741bae31b9ea