This reverts commit 9113ee5b24. It completely broke replies, will have a proper fix later.
9113ee5b24