[FIX] Bundlification remains (Fixes #2463)