Revert "new Trebuchet"

This reverts commit 9fccb2827c55f8d35a585e634524df13d7349a2e.