Reverted previous attempt at automatic step logic for axis labels. Reimplemented logic that removes overlapping labels just before they are rendered.