This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4. Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af