This reverts commit 0e2b4908d0. Although I swear it was tested it apparently broke hwstub on atj. I will need to investigate more whats going on. Revert for now. Change-Id: I2ff3adf8c72bb0e53be7d81b975382adfb700eab
0e2b4908d0
Change-Id: I7b175103e567ae4375ff94e74ed1a06215f640c3
Change-Id: Ic32200f9ab2c6977e503307a9cbe43a1328d0341