This reverts commit 0845447d9c which is
commit 1e82a62fec613844da9e558f3493540a5b7a7b67 upstream.
It breaks the API and isn't something we should really have to worry
about in android devices.
Cc: Sean Tranchetti <stranche@codeaurora.org>
Change-Id: I4ec83063705a9f0fe449ff46803f6594b69efd08
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Signed-off-by: Will McVicker <willmcvicker@google.com>