Temporarily reverted, until fixing the futility-host building issue. This reverts commit e68272b2. Change-Id: I6bc4652841b8dbcf9315515ee98ae23863eaa87b