2bdac8f7e5
This reverts commit e018711aac.
Reason for revert: investigating crash
Change-Id: I157b61a9f1bd46e2fcd3f2f883d3b5c23ca314af