Partial revert of cce501cbde0ba0a53e1f458328bb96dff4dd6588

This code needs to be adjusted to our DetailHeader changes

Change-Id: I3e51949c567bcb44892d2245c481c79d06dfab8b