Remove Trebuchet overlay

This is outdated and breaks the new Trebuchet
Merge remote-tracking branch 'cm/cm-11.0' into HEAD