Don't try this at home! (temp. work-around)

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