Rollback fix for bug 450583 as it caused test failures further down the road

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>