Merge "Revert "Allow reliable detection of a message that is in use.""