The changes in this commit are causing intermittent failures in our CI
environment under Python 3.x.

This reverts commit 55f420f7.
Signed-off-by: NCleber Rosa <crosa@redhat.com>