This reverts commit f06ae844dcfcf0768248139a75d466e341e07fa6. Change-Id: I12111941fc71b9f7e49742e52f9a212382a44b7b