Bundle: Patch to fix #1077.