This reverts commit 408d67a0.

The commit message in the 4.9 stable tree did not have a reference to
the upstream commit id.
Signed-off-by: Sasha Levin <sashal@kernel.org>