Revert d673be6a

I think i selected the remove branch by mistake (due to slow internet) - so I reverted the merger request ... sorry about that.