This reverts commit 5a5cbf7274. This breaks on a default openstack install on Ubuntu 12.10, revert for now until this can be cleaned up to work out of the box. Change-Id: I185509cc30bd28e920cdab60fc92129949bd6b0d
5a5cbf7274