Backout of 714f5b1 for now.

jgoecks_: jmchilto1: 714f5b1 seems to have broken HDA ordering in history panel