Make MetaBroadcaster behaves like in 2.2.x