This reverts commit 0148fde5 . As requested by Luiz. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>