Recommit of code that was working earlier

then it vanished...