Revert accidential changes in the master branch which were supposed to
go into the raffael branch