This reverts commit e73268af.

Seems like an incorrect merge on my end, will pick the upstream
version again next.
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>