Revert installer changes for now, they are not intended for the release as the image
size have not been increased yet.

This reverts commit 7a830faf8aa5c2b68c9c0752886ad6f50082a88a and
5f39cd85a6d31a3c52320d4affd9a97272a83e74.