Revert "Optimized images"

breaks multiple builds

This reverts commit 83cf80d52e863d5256817a0eddab7cacc3ef8ae4.

Change-Id: I17269b2b039194cb4951c7ff4fe4c0240307666e