Revert "Revert "Revert "bla"""

This reverts commit 3e8189e12ae2bd01b7a46f39bee88e76d0fcf5c4.

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