Back to the basics

Change-Id: Ic4dddf271cdc0b65bc89ffd3b45e2e8182e8427a
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>