Revert "hot-fix for broken merge in last commit"

This reverts commit 401a5907d29f8ea3569dda861b9b14482d8816ac.
new repair of trunk