Revert "Revert "bla""

This reverts commit ce095ed631b09a62466e497edae4332b5e685dd5.

Change-Id: I63a88223f12b6c92e29ba86985f43186cd89a305
Reviewed-on: http://gerrit.mni.thm.de/gerrit/318
Reviewed-by: Dennis Voigtländer <dennis.voigtlaender@mni.thm.de>