Test new v2 bundle structure. DONTBUILD
Backout 724ab5d59dc1. DONTBUILD