even more header reverts

Change-Id: I3126aeddcdef70dd5c6f9feb22cb033c8fc9a0ec