This reverts commit 7e890a85bbaaf78b66cc9c6c3bc1af58bd62e1b5. Change-Id: Idc497dd234ae4f9be96d5f39312062eb2bd30d1f