Revert "Merge remote-tracking branch 'upstream/master' into mrcjkb/issue#536"
Revert "Merge remote-tracking branch 'upstream/master' into mrcjkb/issue#536"

This reverts commit 3184457b4fd2c70d3597390eb1df3ee98c0efe81, reversing
changes made to 2604b9990554428ea1655109c8af812052621213.

timmolter/XChart,nroduit/XChart