This reverts commit 01b02a734d2988c22b00f5df6346ad03d8bf52b6. Change-Id: I848c01fc44eb9a51ead1116b2647ed838ec1825f