#3449: debug change

This change needs to be reverted after it has been tested by the
affected users, as it disables the fix for #2057.