This reverts commit af32cc7b.

The commit was incorrectly backported and was causing hangs.
Reported-by: Corey Wright <undefined@pobox.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>