more random bundle changes to get azure to play nice