This reverts commit 74beb4583c. Reason for revert: hip changes not in yet Change-Id: I89e35d171cf01fb82d361279998efcc90e54ef33
74beb4583c