The previous patch didn't apply cleanly since the latest version had
significant changes made including structural. Instead I started with
an empty patch file and made changes manually. This patch includes the
same changes done in our previous patch, but on the latest version of
the chart.