Switch to our Trebuchet

Change-Id: I871a02b7f14ff66ce99bb87b196d8ad25ae29aff