Back to the basics 

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