This reverts commit 834653bcf80a3879c4d80004469053f205d45b69. Change-Id: Ie8cb787490832a0be154ec1263313982157faa81