Revert "Trebuchet (2/2)"

This reverts commit 5b247fde072768fba4ce0f657b748a74a3ff8945

Change-Id: I79782ad1fc368741463da1e418bc4bbfd34a4ace