Goodbye old Trebuchet overlay

Change-Id: I1469cf1ed16a7be0bbe7facb7d8d5625a6286b08