[FIX] Bundlifcation remains (Fixes #2463)