Revert "I cannot take having a broken messages count any longer"

This reverts commit 93472a0feeaa8b348a584e22f4e159eb27fd29ce.