re-added key changes from 3e2adf9b334733d568ecd39f5a2f9624ca5289bb wich ...

...had been removed in 2cfce934c3e82cd05126e90695bb8d9ba4fa1c04