Try to fix a mysterious failure in MessageDispatcherTests (again)