Revert "Update Trebuchet from CM since we track our own trebuchet"

This reverts commit 3ee70e7036eb48c898b207aa77e5786df0b6d6d1.