re-addition from commit 92c5809bb4; was deleted by JC