Revert "Merge branch 'ingo_3_2' into imp_6_2"

This reverts commit 0f66952d02819f2f48506987d27e5d6ebda1b071, reversing
changes made to 6be4899f38615d05cc40e2b42c3bb253b1aad3e9.