This reverts commit d2635859 which is
commit 42caa0ed upstream.

It's not needed in the 4.9.y tree, my fault for backporting it that far.
Reported-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>