This reverts commit 468f17c4f6afac507dba9d4783c7da6fde24f656.
This isn't working on fedora-23 or centos7 slaves for some reason making
it very difficult to get those nodes ready. Revert in order to do more
testing across the platforms.
Change-Id: I634e784b71a2d92a745f8d9c89532e953f48b9cf