Revert: now without bundling to postpone less compilation to the consumer (473a33cdaced5938688e3c3f34f30a1d100ed379)