Revert fix to #594 #677 - causes issues with status messages.