This reverts commit 2a867108951807e467dbfe0fcd4cc48a4d7f4191. Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4