Revert some transient testing.
Final fixups for the charts.