16dbf85da0
This reverts commit d557ade2ad.
Reason for revert: hip changes not in yet
Change-Id: I89e35d171cf01fb82d361279998efcc90e54ef33