This reverts commit 6608a80f. ...and fix the syntax errors. Change-Id: If2ca31d426b2e3eeac8444f7cb24ab21f169d30d