[DEV-1965] Remove fake 'message_set' in favor of real one.