Revert 95f7ac9..59d48ec

This rolls back to commit 95f7ac962130900974e6fb6f71ac9c2c21455d7c.
More chart work