Revert "Merge branch of Ganster41 into ics"

This reverts commit bdd85b6d3155727b634f577db1af5cc46f013fa9.