This reverts commit 13b7fdef.
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>