This reverts commit bc2e897d. The reduction in image size is not helpful enough to reduce the large memory allocations. Change-Id: Iac005c50ba33bbc8f2e75f9dacc0b1dfccf7177b