revert HDR commit

Change-Id: I03951c6da1aa762e4cacde0c77f3dffba2a79a5d