Revert #1200; it was causing #1283 breakages.

The fix for an unnecessary gap on the right of the chart turned out to
break text wrapping for ticks that were legitimately in that position.

Fixes #1283.
Merge pull request #1290 from dnschnur/axis-labels-fix

Revert #1200; it was causing #1283 breakages.