Comment 11 for bug 2045336

After a round of reviews, we have decided not to fix this in ubuntu-image but instead streamline the gadget code itself. I merged the required change yesterday and confirmed today that the image builds are back working again.