Revert "434810 better handling of bad messages"

This reverts commit 3f4a8abf9e9315306a9f0b1b51a2cb355c7a1fe1.
Revert "434810 better handling of bad messages"

This reverts commit 1e524f378ee77962a84c2b5efafe717078a5465d.
Merge branch 'master' into release-9