WORKAROUND for multi-host provision

Change-Id: Ic84000dac7775e0d51016071d9ebdebf1c84b4db