Fix regression that caused messages to be sent to the wrong queue