Revert "latest update from Rainer"

This reverts commit 7849ac55d6fac06cbdc04c0e53fdf7c8bc6b51b8.