This reverts commit 73410cf602c97466619856890da39db820e7cedf.
Change-Id: I2b5032cc990463872e9c03f9a793886936c4f01c
using version 1.0.10