In 3.6 we can have empty bundles, so the `dummy` can be removed.  This used to be a problem :)