Revert "track trebuchet from my git"

This reverts commit 3408d6e7551a6008bde0c01309463e2d2f51e36f.