This reverts commit 012932e05920d43e035c265aea55415e769f7dab. Change-Id: I5578b1560a17981fed1175617981cbd4dae64396