Causes OutOfMemory issues, need to investigate. This reverts commit 0b5c7d19. Change-Id: I263e6cc4df5f9a56ad2ce44e18932ca51d7e349f