Fix for duplicate history entries.

Change-Id: I7c127c487aabfcd5d76b7ddcd810dc6f2f63dc7f