This reverts commit e724990230d267c13f8f820b5fdbe7c58b25d344. Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987