Revert "Trebuchet (1/2)"

This reverts commit 1e7b05f43bba35cd47aa1ae0f185ee76009dbf0f

Change-Id: Ie73d137e0239dd98bc2f78ca12c2c8ee231a66dc
Merge "Revert "Trebuchet (1/2)"" into jb2