Avoid running bundle tasks twice (Issue #1032)

This fixes another piece of #1032