Revert "Revert "Revert "bla"""

This reverts commit 3e8189e12ae2bd01b7a46f39bee88e76d0fcf5c4.

Change-Id: I98e0904287d31061e02eb827edc347b173e40e3d
Reviewed-on: http://gerrit.mni.thm.de/gerrit/319