This reverts commit c6612ff051. Change-Id: I750d9bff9cb89a6ab13af7a33567c3a0fe2af381
c6612ff051
9bd6dac470