This actually breaks our Ubuntu builds which prevents any sort of full testing, so I am reverting this now.

This reverts commit 86c3f90d.

Change-Id: I14d242bfde1efb0144080b882e63542fc2190465
Reviewed-on: https://review.whamcloud.com/28293


Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Jenkins