Partial Backport of status messages

Readding part of the "bug" to fix a more prevalent bug. I'd rather have no message appear 2% of the time than an extra message appear 50% of the time.