Too quick to submit. This reverts commit 029f3e04. Change-Id: Ic1b739f601b5d93eab88cd65b86ddb224ab4c802