This reverts commit 5a11e8d0ba. Change-Id: I7a48b59c4f930dad65ddc8590c25a12636244ea2
5a11e8d0ba
1a4527ce