Partial revert of 4606716 until we debug further
Partial revert of 4606716 until we debug further

This patch partially reverts 46067160e6787631fb5a55193a02794449f22ebf
which breaks deployment on some distros (Fedora). Using this
patch fixes deployment when trying to deploy on a real baremetal
undercloud using Fedora (my dev environment).

Not doing a full revert because this patch was large and it now
causes conflicts to revert cleanly.

Partial bug: 1417307

Change-Id: I2a4f5c4f6ef22092ca97734d02b54838f38b0602

ramineni/myironic,hpproliant/ironic,naterh/ironic,ionutbalutoiu/ironic,openstack/ironic,dims/ironic,openstack/ironic,pshchelo/ironic,bacaldwell/ironic,NaohiroTamura/ironic,naototty/vagrant-lxc-ironic,NaohiroTamura/ironic,ionutbalutoiu/ironic,SauloAislan/ironic,Tan0/ironic,supermari0/ironic,dims/ironic,redhat-openstack/ironic,SauloAislan/ironic,devananda/ironic,naototty/vagrant-lxc-ironic,pshchelo/ironic,rdo-management/ironic,bacaldwell/ironic