Revert "Revert "Revert "Revert "bla""""

This reverts commit d8fb58c8f9d2671e2beefd7c74945d8d0d017fa1.

Change-Id: I5ef07d750151b874acc522b84543b38ae553f99c
Reviewed-on: http://gerrit.mni.thm.de/gerrit/320