This reverts commit 6bf7d3c5.

The commit message is for a different patch. Reverting and then adding
the same patch back with the correct commit message.
Reported-by: NBen Hutchings <ben.hutchings@codethink.co.uk>
Cc: stable <stable@vger.kernel.org> # 4.19
Signed-off-by: NTodd Kjos <tkjos@google.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>