DELTASPIKE-339 revert to gerhards version

Now I know why gerhard fixed it that way... ;)