Chords broken in master.  Closes #2297