Always use mediator, emergency deadlock fix until 3.1