This reverts commit 59b706ce.

This change depends on more changes that didn't exist in 4.9 and older.
Signed-off-by: Sasha Levin <sashal@kernel.org>