This reverts commit 09b1d962. Reason for revert: bullhead broken Change-Id: Ib4562f944cdc2618cc3ed3beb4f612f0ef8b3223