Revert "overlay: fixed Trebuchet layout"

This reverts commit 67fb36c3dda4601f292e122ac59bfedbf14502cd

Breaks build, overlay variables names have changed.

Change-Id: Ic2550ffb74d414b7563fe92831b4b4fe3980dd11