Revert to fully stable Trebuchet

Change-Id: Id1e25757826c80a2e80c61b7d73ee877a07ba99d