Kill for real image bundling.

Fixes for EUCA-9351