Also, if Bundle.module is defined, maybe it should use that?