it's still exceedingly verbose, but whatever

Change-Id: I816455ea6dc6a5fecdde06f1cfa252485553e009
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>