This reverts commit f996b76623.
Change-Id: I855a61070411b2a1fa8f1add10998aaabcef43f6
Fixes: 72369036
Test: Manual; builds and runs
This reverts commit f996b76623.
Change-Id: I855a61070411b2a1fa8f1add10998aaabcef43f6
Fixes: 72369036
Test: Manual; builds and runs