This reverts commit d10f9056 due to a build
breakage.

See http://spunk.home.kraxel.org/bb/builders/ubuntu-default/builds/52Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>