This reverts commit 8ffe4bc932. Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
8ffe4bc932
9bd6dac470